From: Linus Torvalds Date: Mon, 21 Feb 2011 22:57:39 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15124 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=b4f5c46245cf4ca437849c0d04c176b4c150622d;p=linux-4.9.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] update cifs version cifs: Fix regression in LANMAN (LM) auth code cifs: fix handling of scopeid in cifs_convert_address --- b4f5c46245cf4ca437849c0d04c176b4c150622d